applied patch from dmacks at netspace.org cleaning up some of the build

* extensions/Makefile.am: applied patch from dmacks at netspace.org
cleaning up some of the build system.

svn path=/trunk/; revision=346

diff --git a/ChangeLog b/ChangeLog
index d3b9fc02ed41f3b1b905b3364dac820f8fc7eb79..466aa5bade6f655dd47832270f332accf01bff40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-01  Øyvind Kolås  <pippin@gimp.org>
+
+       * extensions/Makefile.am: applied patch from dmacks at netspace.org
+       cleaning up some of the build system.
+
 2008-06-28  Zhang Junbo  <zhangjb@svn.gnome.org>
 
        * extensions/frequency.c: changed RrRiG... back to RrGrBrArRiGiBiAi.

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 2510a938c069038cc97354939d515eb67dc57164..3a56830688d0957e3afde616e4c3b3cc84d9b67a 100644 (file)
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -13,11 +13,11 @@ EXTRA_DIST      = $(wildcard *.[ch])
 
 all-local: $(SOBJS)
 
-CFLAGS += \
-       -I $(top_builddir)              \
-       -I $(top_srcdir)                \
-       -I $(top_srcdir)/babl           \
-       -I $(top_srcdir)/extensions     \
+AM_CPPFLAGS = \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_srcdir)/babl            \
+       -I$(top_srcdir)/extensions      \
        -fPIC
 
 LDFLAGS += $(DYNAMICLIB)
@@ -29,7 +29,7 @@ LDADD    = $(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION)$(SHREXT) $(MAT
 endif
 
 %$(SHREXT): %.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
+       $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 
 # if extension needing external libraries are to be # compiled with this make
 # file, each of them can be added according to the this pattern:
@@ -37,12 +37,13 @@ endif
 #      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  [own compile and link flags]
 
 CIE-Lab$(SHREXT): CIE-Lab.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
+       $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 
 sse-fixups$(SHREXT): sse-fixups.c
        $(CC) $(CFLAGS) $(MMX_EXTRA_CFLAGS) $(SSE_EXTRA_CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 #lcms$(SHREXT): lcms.c
-#      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
+
+#      $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
 #############################################################################
 
 clean-local: